@@ -449,6 +449,8 @@ def consumer_info_api(request):  | 
            ||
| 449 | 449 | 
                })  | 
            
| 450 | 450 | 
                 | 
            
| 451 | 451 | 
                if not dupload:  | 
            
| 452 | 
                + log.integral = model.shot_member_integral  | 
            |
| 453 | 
                + log.save()  | 
            |
| 452 | 454 | 
                user.shots_num += 1  | 
            
| 453 | 455 | 
                user.integral += model.shot_member_integral  | 
            
| 454 | 456 | 
                # 配件不增加会员等级,只发放积分。  | 
            
                @@ -228,7 +228,7 @@ class LatestAppScreenInfoAdmin(admin.ModelAdmin):  | 
            ||
| 228 | 228 | 
                 | 
            
| 229 | 229 | 
                 | 
            
| 230 | 230 | 
                class ConsumeInfoSubmitLogInfoAdmin(AdvancedExportExcelModelAdmin, ReadOnlyModelAdmin, admin.ModelAdmin):  | 
            
| 231 | 
                -    list_display = ('user_id', 'phone', 'model_name', 'serialNo', 'dupload', 'submit_during_activity', 'has_used', 'created_at')
               | 
            |
| 231 | 
                +    list_display = ('user_id', 'phone', 'model_name', 'serialNo', 'dupload', 'submit_during_activity', 'integral', 'has_used', 'created_at')
               | 
            |
| 232 | 232 | 
                     list_filter = ('brand_id', 'submit_during_activity', 'activity_id', 'dupload', 'test_user', 'verifyResult', 'has_used', 'status', 'code_version', 'created_at')
               | 
            
| 233 | 233 | 
                     excel_fields = ('created_at', 'phone', 'model_uni_name', 'model_name', 'serialNo')
               | 
            
| 234 | 234 | 
                     search_fields = ('user_id', 'phone', 'serialNo', 'model_name')
               | 
            
                @@ -0,0 +1,20 @@  | 
            ||
| 1 | 
                +# -*- coding: utf-8 -*-  | 
            |
| 2 | 
                +# Generated by Django 1.11.26 on 2021-04-26 03:27  | 
            |
| 3 | 
                +from __future__ import unicode_literals  | 
            |
| 4 | 
                +  | 
            |
| 5 | 
                +from django.db import migrations, models  | 
            |
| 6 | 
                +  | 
            |
| 7 | 
                +  | 
            |
| 8 | 
                +class Migration(migrations.Migration):  | 
            |
| 9 | 
                +  | 
            |
| 10 | 
                + dependencies = [  | 
            |
| 11 | 
                +        ('mch', '0060_modelinfo_is_show_shot'),
               | 
            |
| 12 | 
                + ]  | 
            |
| 13 | 
                +  | 
            |
| 14 | 
                + operations = [  | 
            |
| 15 | 
                + migrations.AddField(  | 
            |
| 16 | 
                + model_name='consumeinfosubmitloginfo',  | 
            |
| 17 | 
                + name='integral',  | 
            |
| 18 | 
                + field=models.IntegerField(default=0, help_text='\u79ef\u5206', verbose_name='integral'),  | 
            |
| 19 | 
                + ),  | 
            |
| 20 | 
                + ]  | 
            
                @@ -680,6 +680,8 @@ class ConsumeInfoSubmitLogInfo(BaseModelMixin):  | 
            ||
| 680 | 680 | 
                ym = models.IntegerField(_(u'ym'), default=0, help_text=u'年月', db_index=True) # 例:201712, tc.local_string(format='%Y%m')  | 
            
| 681 | 681 | 
                ymd = models.IntegerField(_(u'ymd'), default=0, help_text=u'年月日', db_index=True) # 例:20171208, tc.local_string(format='%Y%m%d')  | 
            
| 682 | 682 | 
                 | 
            
| 683 | 
                + integral = models.IntegerField(_(u'integral'), default=0, help_text=u'积分')  | 
            |
| 684 | 
                +  | 
            |
| 683 | 685 | 
                province = models.CharField(_(u'province'), max_length=32, blank=True, null=True, help_text=u'省份', db_index=True)  | 
            
| 684 | 686 | 
                 | 
            
| 685 | 687 | 
                test_user = models.BooleanField(_(u'test_user'), default=False, help_text=_(u'是否为测试用户'))  |